Add differentiating transitions for returning/reentering.

Bug 16550363

Change-Id: I85f9a8bcbc92ce048d06b36579bb05893534f7f8
7 files changed