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

Change-Id: I3350563a36213ed590113191b41a9f284c4fdb31