Merge "Settings: Fix IllegalStateException force close" into r-keystone-qcom-dev