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

Change-Id: Iacab2fc896a9fb7a8313926b0f6dfc5355d468a2