Merge "DisplayCutout: Support more than one cutout" into pi-dev