Merge changes I259a66fb,I861d2545

* changes:
  Fix inadvertently inverted notif count check
  Simplify StatusBarNotificationActivityStarter