Merge "Set the light status bar flag if not in dark mode" into udc-qpr-dev