Merge changes from topic "rollback" into rvc-dev

* changes:
  [DO NOT MERGE] Fix NPE from uninitialized object.
  [DO NOT MERGE] TouchExplorer: do not use accessibility action to long click.