Merge "Refactored display white balance names/docs."