Merge "Convert the BrightnessController to a log scale control." into pi-dev
am: 56a5620b41

Change-Id: I440109410c4cac5ebd175e05e9f12bad0de09ed4