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

Change-Id: Ie871ce7d3e77af215ac36c42aa0e848ac2bc1838