Merge changes from topic "mtp-user" into oc-mr1-dev

* changes:
  Add additional context to MtpDatabase
  Reset functions to null when user changes.