Merge "Exorcise notification panel ghosts. Bug: 5105599"