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

Change-Id: I94d7856d107dbf0d16f008e131fa09b7b78f748e