Merge "Apply display ratio to cutout protection" into tm-dev