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

* commit '98c3d6c971a3dee26cbf2d49d4c901e516302223':