Merge "Don't create unexpected display cutout or rounded corners" into tm-dev