Merge "Remove some references to skins/common/ in comments"