Merge "Changing the ordering for heads up notifications" into mnc-dr-dev am: 688e046bad
am: f9c4f745e6

* commit 'f9c4f745e6a4e8586baab085dc86b9b2b187f48a':
  Changing the ordering for heads up notifications