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

* commit '49ebad9e6613eab93705d10096c1af4539b5e9c9':
  Changing the ordering for heads up notifications