Merge "Bug 2932: NPE on bundle activation"