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

Change-Id: I41ec14fb2ff092643c2ce54e263da91769541b49