Sync up with upstream

Cherry pick recent changes related to appbar and splitview.