Merge "Limit translation of bottom panel snapping to not overshoot." into cw-f-dev
am: 81b4314540

Change-Id: Ifa94061dac983dd46d8bad2d284afd116389b4f4