Merge "Fix NPE when querying preferred without an account"