am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"

* commit 'da506ffabadd551241e23aecf08e378e7d0f30b1':
  Prevent infinite layout and wallpaper flashing