Merge "Make sure mFocusedStack is never the home stack." into klp-dev