Merge "Adjust bottom picker padding / margin & add a drag handle" into sc-dev