Merge "The undefined media sizes for both orientations not properly constructed." into klp-dev