Merge "Fix screen rounded corner flicker." into tm-dev