Merge "SurfaceFlinger: add display power state timer" into qt-r1-dev