Merge "Fix incorrect handling of pending activities" am: 9a1b8610eb
am: 9a0c1b392d

Change-Id: Idfb5e1b85cb8d24360a617deb16f0b7cde1728eb