am 17b71e59: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '17b71e59':
  Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"
  Deleting objects on the wrong thread is a silly idea Bug #7195815
  P2p fixes
  Regression in screen introspection APIs due to the multi-user change.
  Fixing various QS issues. (Bug 7216908, Bug 7217154)
  Add extra error check when eglCreateContext fails Bug #7216919