Merge "Only show collapse handle when the bottom widgets picker is scrollable" into sc-dev