Merge "Remove obsolete Settings unit tests"