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

Change-Id: I76310bc071aba99ba943017a01180fc5b4b8584c