am ff0bd7db: am 25f0c808: am 96a9f357: Merge "Fix unintentional setup step advance in orientation change" * commit 'ff0bd7db': am 96a9f357: Merge "Fix unintentional setup step advance in orientation change"