Merge "Adding support for custom callback when starting ProxyActivity" into ub-launcher3-qt-dev am: 3d6e96d526
am: a9c0d66d6c

Change-Id: I192af95e65de6310010e16ef0a545c70f62e27a2