Merge "Add display white balance setting"