Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
am: f1f25ad5f2

Change-Id: Idc05690e4201c5b379f41d2f78e951556dd96fc5