am 9884d4cd: Merge "Fix null pointer exception in year picker Retain year picker position offset on orientation change" into jb-mr2-dev

* commit '9884d4cda847b494c8174ec96b0014fa40032d95':
  Fix null pointer exception in year picker Retain year picker position offset on orientation change