[automerger] Merge "Make rotate nav+qs icon consistent, understandable" into pi-dev am: f8dc8e37 am: 39880861 Change-Id: I8849835d253ec8fbe85d0d0c3aab628a28ea4870