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