Merge "Replace use of deprecated methods in Linker and SkinFactory classes"