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

Change-Id: Ife380bd268aa2c760dff2dec4f7a8358721cbe95