Merge "Fix preview image overlaps a call button during video call" am: 33cc4999be am: 2ec69519ac
am: 91c705de19

Change-Id: I44e2684c301deed8687b69aa4b492bc8766fcc89