Merge "Revert^2 "Update content description of active mode icon in Status Bar"" into main