Merge "Remove unnecessary namespace from XML styles/themes"