Fix for Activity Transitions restoring views bug.

Bug 26426496

When finish() came immediately after finishAfterTransition(),
the Views of the reentering Activity would not be restored
properly. This forces the entering Views to show if they
aren't already transitioning in.

Change-Id: If3ab37be8eb5dd3d7649db75385adb9fa214cb4c