Merge "Fix "Record issue doesn't stop after tapping the chips on status bar"" into main