am 19e7c3b6: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"
* commit '19e7c3b647f182314da2a20df8f0271e70bed356':main
commit
ecda2f1328
* commit '19e7c3b647f182314da2a20df8f0271e70bed356':main