Merge "Fix brightness dialog background to be light" into oc-dev am: 175f53b2d6
am: aee0dd3ab0

Change-Id: I75f50fea8b504f7058fda5e83320e172ad298649