Merge "msm: separating frame divert and post process path." into msm-3.0