move to jb-2.6 caf varients for media and display