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

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