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

Change-Id: Ie168558ee24c37c89d254575acca5aa35b88f505