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