Fixing two critical bugs in all apps transition controller am: 0a9c092c89
am: ea045e7532

Change-Id: I64a1d4620427d4c7d9dcb67a27dc07fb1f5aa03b