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

Change-Id: I1cda8ecb6e0878ffd133a35b32259171991762b2