Merge "Apply prior tint to rotate icon on recreation" into pi-dev