Merge "msm_shared: edp continuous splash support"