Merge "Use consistent method to get current user" into tm-qpr-dev