Merge "Change optional codec status when selectable codec is valid"