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

Change-Id: I0662079c2183a094d5352504172c000ef483d658