Merge "Change input injection security model to require INJECT_EVENTS permission" into tm-dev