Merge "SurfaceFlinger: expose idle timer as device config"