am dfb5839b: Merge "Catch ActivityNotFoundExceptions in onClick" into lmp-mr1-dev

* commit 'dfb5839b7827f889036d6facccf0d962aa2f082b':
  Catch ActivityNotFoundExceptions in onClick