Merge \"QS: Show date even on small screens\" into nyc-dev
am: 883da638e2

Change-Id: I4bc7594fa5004c8d58933d9432a70353474f07e4