Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev am: 6f14dc95cf
am: 73ffa4e88a

Change-Id: I34d4c0f6b1021c1e1c8ae8db3a7ee2a1ab8b39bf