Merge "Remove the light flag if the bar isn't specified light in theme" into sc-dev