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

Change-Id: Ia09141c88e964ccfafe75fa6a0d0c7e19ddeadd4