Merge "Separate hdcp levels into a base interface" into main