Merge "Fix ACTION_CANCEL handling in status bar. Bug: 5198231"