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

Change-Id: Ic6b622398c1426be3b48096ec6a041ee6c38fd0d