am cc6029b8: (-s ours) am dc085ed2: (-s ours) am 5825ad23: (-s ours) Revert "Reduce display device log spam." DO NOT MERGE ANYWHERE

* commit 'cc6029b82bb83faf237e3f718a5479db0c53d839':