Merge "msm: vidc: Increase timeout for power collapse"