automerge: 0dea93c * commit '0dea93c0ca1d4ec03fa641d19a25f1267165eecd': Ensure time picker dialog fits on small screens