Merge "Basic renaming refactoring in Layout" into jb-dev