[automerger] Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am: b2dac061 am: 5d0c692f Change-Id: I1498fe2942980126a28794c82035b54f234365a2