Merge "Update media3 button tests and error handling" into main