Merge changes I86d2f5b7,Iea81035e

* changes:
  Change bottomsheet peek height.
  Updated bottomsheet to be scrollable.