Merge "Fixed when the CompatibilityBridge is attached to an activity." into pi-dev am: 45fda27211
am: bc75159db6

Change-Id: Ibefc537b796cef5522f854c8abd3e942e545f2f8