Merge "Revert "Fix flicker when swiching resolution change"" into tm-qpr-dev