Merge "Fixing issue in parsing arguments for setUserDisabledHdrTypes"