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

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