Merge "Implements queryNonIndexableKeys for Settings"