Merge "Settings: Add synonyms to display cutout emulation setting" into pi-dev