Merge "Handle SubSettings instance leaks in Index.java"