Merge "Mark mediaprovider apex as compressible" into sc-dev