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

Change-Id: Idfc119f974b357d3a0fd3d5f696b7290e7e78fdf