Merge "Revert changes waiting for launcher to resume when transitioning to home" into tm-dev