Merge "Fix wait condition for SetRequestedOrientationWhilePinnedTest" into tm-dev