Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev