Merge "media: allow feature-can-swap-width-height to be optional." into mnc-dev