Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev