am 5e5ce873: Merge "Fix SecurityException crashes in onClick" into lmp-mr1-dev

* commit '5e5ce873a670fdf68470db3d340a63d5afee7fa4':
  Fix SecurityException crashes in onClick