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

Change-Id: I3289be6435be80db8fa76a0e14b0bdef0ce317ee