am 6f3b20cc: Reconcile with jb-mr1-release - do not merge

* commit '6f3b20ccc14c25173780f01c621dbb2279cd8236':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
  Notification vibration improvements: [DO NOT MERGE]