Merge "Ensure only internal display display interactions are logged." into tm-qpr-dev