* changes: Merge changes from topic "mtp-user" into oc-mr1-dev am: 4de4655f Reset functions to null when user changes. am: e537a831