Merge "Fix light status bar transitions" into mnc-dr-dev