Merge "Log screen-on latency with tron" into oc-dev