Merge "Reduce overhead of activity launch observer" into tm-dev