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