Merge "Require syncing be enabled before storing calls"