Merge "Check DreamActivity callback type to prevent class cast exception" into tm-qpr-dev