Merge "Fix Flicker of inner corners in split screen when quick switching to" into tm-qpr-dev