Merge "Only update the display when brightness and state are valid." into sc-dev