Merge "Changing the ordering for heads up notifications" into mnc-dr-dev