Merge "Blacklist Night display settings for testing" into oc-dr1-dev