Merge "SurfaceFlinger: add display power state timer"