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

# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '505232be07e388c602529e14254df013637b16f2':
  Fix of Settings application sort crash