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

* commit 'f716d815af8927cb965e17cb04c7322bb4468599':
  Use old-style pickers on sub-small screens

Change-Id: I44459b68b1bab960840b64aefe977b6880ce7f13