Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa
am: 31f5af501f

Change-Id: I2a6c5b0cf508d1e4c9d9f631d8936f0a31db12f8