Merge "MtpDatabase: Fix typo affecting parent and format queries" into jb-mr1-dev