Merge "Fixing activity leak via ActivityInitListener" into ub-launcher3-rvc-dev am: 585628e270

Change-Id: I2dfa8e7651ebd7b70b6e2c92ed0008b4a6f2a8ba