Fix a resource leak in ControlMapping.cpp
Fix a case where a pointer was being used before its null check in MediaEngine.cpp
Merge pull request #2433 from lioncash/master

Fixed a resource leak in ControlMapping.cpp and a null check problem in MediaEngine.cpp