am a8859a0a: Merge "Preset type; contact shortcuts are now launched w/o provider invocation" into jb-dev

* commit 'a8859a0a6b9787b156ef8ae7eba5c9fe1a5cd453':
  Preset type; contact shortcuts are now launched w/o provider invocation