Merge "Fix bug #2793828 (Sync/visible setting on the phone should not affect what's visible on the web.)"