Merge "Ensure backlight doesn't change when rbc is toggled" into sc-dev