Merge "Stop RBC affecting brightness so drastically" into sc-qpr1-dev