[ALOY-1146] properly merge datetime picker styles (1_5_X)
Merge pull request #576 from skypanther/ALOY-1146e

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