am 19427156: Merge "Don\'t crash when preferred activity settings are malformed" into klp-dev

* commit '194271565399a9216b8e0dece118874fc5f7e474':
  Don't crash when preferred activity settings are malformed