Merge "Fix issue #3405957 com.android.settings: java.lang.NullPointerException..."