Merge "Merge "Fix One-handed tutorial looks janky on entering transition" into sc-dev am: ed889bb8 am: b62b4923" into sc-v2-dev-plus-aosp