Merge "Shortcut Helper - Close the helper on CLOSE_SYSTEM_DIALOGS broadcast" into main