Merge "Fix close button in workEDU card not 48dp." into main