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