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

Change-Id: Ic1be6d9c3336fe78d1a7beb06d712fd88fa2e9ed