Merge "Fix npe in FrameHandler" into tm-dev