Merge changes Iffd15e95,Id2db95ec

* changes:
  Log notification clicks
  Add userId to StatusBarNotification key