Merge "Fixed screen brightness override in manual mode." into pi-dev am: bfb35ad004
am: 48638d8f2e

Change-Id: I1c300d3cf433ed89e3e03979d20888d735b226e1