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

Change-Id: I1d5711167309ce1cb65ddf24bdd8e6392d83bd40