Merge "Ensure time picker dialog fits on small screens" into lmp-mr1-dev