Merge "Clean up desktop mode logging" into tm-qpr-dev