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

Change-Id: Ieef8f0cce3dff1fb0c92dea3700e6a7723805399