Merge "Adding Match content frame rate setting preferences"