Merge "Cutout: Add developer setting to mask the display cutout" into pi-dev