Merge "Mark Media APEX as visible"