Merge "Fix Activity Transition mess-up." into nyc-dev
am: bd34103c5d

* commit 'bd34103c5defbfd180be6a387eb5aa82d4b97eac':
  Fix Activity Transition mess-up.

Change-Id: I3c0785fa6a862d41210b124ab8836c0594990457