Merge "SF: fix deadlock while switching resolution" into tm-dev