am 16290220: am 039a2c11: am 13348ffc: Merge "Simplify wallpaper strip animation." into jb-ub-now-indigo-rose

* commit '16290220b0ca75a9a519f8edff6f61efd2b48dbf':