Merge "Add deprecated note to SkinTemplate"