AUI-1530 Reduce zindex of current time placeholder
Merge branch 'master' into master-deprecated