Merge "Don't do in-window animations if launching an activity." into tm-dev