Merge "SF: Fix deadlock while stopping idle timer" into tm-qpr-dev