Merge "msm: vidc: Fix a bug in state transition"