Merge "Fixed screendecorations flickering while resolution change" into tm-d1-dev