NXP-11994 Refactor content disposition resolution