Merge "Remove @hide on SyncColumns, make them protected"