Merge "Revert "Add additional context to MtpDatabase"" into pi-dev