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

* commit '148187255ecaaaf6a35920f779fa6a171433ccd4':
  Prevent infinite layout and wallpaper flashing