Merge "Fix crash when changing display cutout" into rvc-dev