Merge "Clean up DisplayController logs" into tm-qpr-dev