Merge "Move MediaHandler defaults out of global scope"