Merge "drm/msm/sde: handle prepare_fb later during sec/non-sec transitions"