Merge "Re-add text color to Settings Switch" into udc-dev