Merge "Revert "Check if task was top of stack before it's removed""