Merge "Use old-style pickers on sub-small screens" into nyc-dev