Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev
am: f8dc8e378a

Change-Id: Ife59bc02c30446efe6764fcfd5e8813c46e1543f