Merge "[SB][RONs] Remove duplicate StatusBarRonChips class." into main