Merge "Split Generic into MediaHandler and ImageHandler"