Merge "Defer stop for all activities becoming invisible" into pi-dev
am: 318e52881e

Change-Id: I9ade540400f07e5a1ad099a5f945f06954060afd