Merge "Defer stop for all activities becoming invisible" into pi-dev am: fd77e69f28
am: 72039c7a7c

Change-Id: Ia624934e99a85028b20fc261da13cf9c7d1e71a7