Merge "Revise manifest for adding trampoline activity" into tm-dev