Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev