Merge "Add the ability to force car emergency and car warning notifications to the top"