Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev