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

Change-Id: Icf84c4641c2d9dd626896e5e18a0308189c3cfd4