Merge "Make the night display suggestion depend on a flag." into pi-dev