Merge "Fix bug #12903673 Stability: 47 ANRs in com.android.settings"