Merge pull request #5070 from Memphiz/osx_fix_devicechanged_recursionbp