Merge "measure snooze UI use more precisely" into oc-mr1-dev