Merge "Always go to home in case of fling-up am: 64155533b6 am: 6991a015ad" into qt-r1-dev-plus-aosp
am: 641a5264d9

Change-Id: Ia62e9fc6dbd44e57bf6741bccd9563450c08fe72