Stop doing backflips to do task operations in ActivityStack. Change-Id: I57b1be6affcb8b7d504ae33b3e44bde2e6253f1c