Merge changes from topic 'tron' into mnc-dev

* changes:
  instrument notification longpress controls
  induct a bunch of new logging categories.