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