Merge "Ensure home activity always is on home stack." into oc-dr1-dev