Merge "msm: camera_v2: Use stream cnt for unique stream id"