Merge "Finish pending activity or dialog when the current session ends" am: ce9d5d6555
am: b313a1ac7c

Change-Id: I7d615ed65e7871cbb4896bebbb0ffba15c11e781