Merge "Provide content insets while in SUW in portrait mode" into tm-dev