Merge "Refactor FileInserter in MediaScanner and adding unit tests for the newly added class."