Merge "Simplify display capture config API name"