Merge "Fixes an issue where users could be stuck with heads up notifications"