Merge "StatusBarIconView: remove unused mDismissed property" into main