Merge "Fix the Java crash in Settings : java.lang.IndexOutOfBoundsException" into 24D1-dev