Merge "also log user-initiated notification collapse events" into oc-mr1-dev