Fixed CC-5045 and Now Playing time remaining style improvements
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x