Merge "Fix SetRequestedOrientationWhilePinnedTest with Shell transition" into tm-dev