Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev