Merge "Merge "Apply prior tint to rotate icon on recreation" into pi-dev am:...
Merge "Merge "Apply prior tint to rotate icon on recreation" into pi-dev am: a42585c3" into pi-dev-plus-aosp
am: da7d6239
Change-Id: I3c820ebdd9bb68a55a6dfc525b6c9d8394bf8c12