Merge "Require N for preferred SIM query"