Merge "Fix SecurityException crashes in onClick" into lmp-mr1-dev