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

Change-Id: I75bba81e56e82c0cea48a3878d4bcd24e74f4b9e