am 61a75423: Merge "Follow up CL for heads up notification refactoring" into mnc-dev

* commit '61a75423648a0070406e9b7aeda1a55e173bd467':
  Follow up CL for heads up notification refactoring