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

Change-Id: I1463f360f286e7770d0e7ecd5e7d3ab69ecff837