Merge "Move night display settings queries"