Merge "Fixes getting the wrong app transition going home after minimized...
Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev am: eb36d839
am: 3bff170f
Change-Id: Icc6d2455e03d77c52d42f2cf95cbcffb95045719