Merge "Fixing small issue with widget divider showing in Phone UI and Shop text showing in other languages."