Merge "Fix BridgeContext.resolveThemeAttribute color parsing"