Merge "Updated numberpicker_ assets Bug: 5076695"