Merge "Notify draw for relaunch with preserved window" into tm-qpr-dev