Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am: b2dac061bb
am: ce2b842a02

Change-Id: I3af2aca768ffbe310b16fdbc379c77b1490710f1