am bbf8daf4: am 505232be: Merge "Fix of Settings application sort crash"

# By Jia Arlan
# Via Android Git Automerger (1) and others
* commit 'bbf8daf4602b62d806c4946196b526edbe08e056':
  Fix of Settings application sort crash