Merge "drm/msm/sde: move frame_done_timeout after phys encoder disable"