Merge "Finish sync for unchanged drawn window" into tm-qpr-dev