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

Change-Id: I3f6c2b85aacce4e5b068df65a1b137888e6b4e70