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