Merge common.less changes from team-africa