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

Change-Id: Ic9ab6e6e4de45347ee2936738bdd0d88e2493789