Merge "Remove unused string resources"