Merge "Run MediaStore version test only when flag is enabled" into main