Merge "Rename dev options xml file"