Merge "Ensure home activity always is on home stack." into oc-dr1-dev am: 560acb043d
am: 0d2c7dace3

Change-Id: I1399f6c7425d8f7e3ef6c69a25b67b96597574b1