Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev