Merge "Revert "Reset dismissAction and notifyCancel dismissCallbacks when altBouncer removed"" into main