[ALOY-1146] properly merge datetime picker styles (master)
Merge pull request #575 from skypanther/ALOY-1146d

[ALOY-1146] properly merge datetime picker styles (master)