Merge "msm: mdss: Reorder code to avoid null pointer dereference"