Merge "Handle string resources containing html tags for style" into rvc-dev