Merge "Fix bug #21025020 Stability: JCs in Settings: Caused by: java.lang.NullPointerException" into mnc-dev