Merge "Fix issue 2512221: Car Dock Notification doesn't go away"