Merge "Always go to home in case of fling-up am: 64155533b6 am: 6991a015ad am: 63b2cbc0c7" into qt-qpr1-dev-plus-aosp
am: de87b780cb

Change-Id: I96bd9279d5243dd203fb37f9eeb5ca73af8b4de7