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

* commit '80f99121ea96cdabea6260ab165e7183431be513':
  Prevent infinite layout and wallpaper flashing