MOHO-52 NPE when getting media service from call.
Merge branch '1.1'