Fix CSS sorting order

@bug W-2034311@

@rev byao@
Merging origin/goliver/master-pending-css-order into master