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

Change-Id: If0731ddfa7fb95e4b810ca80115b4d1c8714a875