Merge "Adjust the physics params to values decided on in meeting w/ design." into qt-dev