Merge "Revise layout for DateTime setup" into honeycomb