Merge "SF: trace display power state" into udc-dev