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

Change-Id: I8daf4f4a34631700b6e3b62bcc24a9f3554fbad6