Merge "Fix cutout flicker while switch screen resolution" into tm-dev