Merge "Make credential confirmation activity resizeable." into qt-dev am: e455680bd2 am: 72b85a3798
am: f59ce06159

Change-Id: Id3c7af34d5908bd5dbb826fdce88ef60555582da