Merge "Fix reference to old string in Inline controls."