Merge "Catch ActivityNotFoundExceptions in onClick" into lmp-mr1-dev