Merge changes Ie66b64b0,I55c0edf2 into main

* changes:
  Use approachLayout for squishiness
  Properly animate second page collapse