[automerger] Overshoot when flinging up from an app am: b45444b250 am: 34838cf551

Change-Id: Ib6cd939131e5df32f713d39bb180f5e2759ddb1f