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

Change-Id: Ied9bf6e53e6ce7e97efd3c889fd33a656e76b489