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

Change-Id: I115b7bc6d165dc9d5e73e1878b96d194bfc62da7