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

Change-Id: Idfae735cc0ebd92f624a78c7072e32db4e8f89cb