Merge "Resolve NumberPicker display abnormal issue." am: 434e4fdfdb
am: 17c0df4aa4

Change-Id: Idd61b68dc773114fe09fcd7f8aebd1043c1a838d