Merge "Keep scene change code in framework transitions in sync with AndroidX"