Merge "Fix number picker vertical scroll computations" into klp-dev