Merge "Introduce a private flag to extend frame with cutout" into tm-dev