am 6b04e3a6: Merge "Fix light status bar transitions" into mnc-dr-dev

* commit '6b04e3a6ea042be0e012f7501fadb461b3d772a7':
  Fix light status bar transitions