Revert "Revert "fix number picker blue line and highlight""

This reverts commit 4cd01c562dfe71adc425ff13eb4f201df98be63d.