Merge "Prevent authenticators from using Settings to  launch arbitrary activities." into klp-dev