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