am 4fc2ea84: Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev

* commit '4fc2ea8402b62001b225bf4e1a335c4cbf3b65ea':
  Ensure time picker dialog fits on small screens