Merge "Remove expensive queries for lock task mode (screen pinning)" into tm-qpr-dev