Merge "Fixes getting the wrong app transition going home after minimized (1/2)" into oc-dr1-dev