Merge "RDKCOM-4703: update common resolution list for getSupportedResolutions" into rdk-next