Merge "Prevent beeps in property editor"