Merge "Clean up time picker attributes and drawing code"