Merge "Add support to register Java listeners for prox activation" into sc-dev