Merge "Use CDS display white balance getter and setter" into qt-dev am: 65b535f44a
am: b4a96145bb

Change-Id: I1a32a5e19fd47778236614b74549e929a0007909