Merge "Fixed NPE when dumpSettings is called with a null cursor" into mnc-dev