Merge "Update alignment for gear / snooze icons to shift when expanded" into oc-dr1-dev
am: 0b8a985cd6

Change-Id: Ib8d76ea165032175be98e8c1023af6c973be1ee4