Merge "Test that _modifier defaults to MODIFIER_MEDIA_SCAN after db upgrade" into sc-dev