Merge changes Ie8bf816b,I8045cb47

* changes:
  Allow tapping notification icon to expand/contract.
  Prioritize ContentTitle over the SubText