Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
am: 23c981923f

Change-Id: Iee35e732fea26385d96a3ffa6756d944976f921f