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

Change-Id: I94f9c4c8b214d52e62fe603b06fbef73dca59a0a