Merge "Fix transition between two occluding activities" into oc-mr1-dev
am: 8e2615c372

Change-Id: I9671da6a339c64369504450bfff48d48a1942aa2