Merge "Change Night Display slice title to "NightDisplay"" into pi-dev