Merge "Change MSAA sample-count error to warning" into marshmallow-cts-dev