Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev