Merge "Fix preview image overlaps a call button during video call"
am: 33cc4999be

Change-Id: I1c68639b40fedde8b913c5e510e758b9d5493ea3