Merge "Remove/document @hidden APIs in Canvas"