Handle back-to-back height reduction animations am: 24ba787ded

Change-Id: I55e483165f2cbd6a09aec94aede78971f8257f20