Merge changes from topic "bottomsheet-with-insets" into main

* changes:
  Align the margins between handle, text, and container with main picker.
  Update the app-specific picker to have a container like the main picker