Merge "Bring home to front behind assistant stack when needed." into oc-dr1-dev am: 0a3684eb45
am: dd72696f92

Change-Id: Ib67c3ba202440d4876163c4a9c23b2d158dd4a0b