Merge changes I2da66b54,I8a65428d

* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.