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