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

Change-Id: Ia8b077236c115cea8581b53af97f312d10be9080