Merge "Reinflate notifications for overlay changes"