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