Merge "Avoid changing display power state on draw wake lock" into pi-dev