Merge "Ensure activity visibility gets updated before executing transition" into tm-dev