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

Change-Id: I1414692a012e14ebcc30a1ca4e1d3fab84bccba2