Merge "Fix error-mask in db_sync state"