Merge "Add developer menu to select max number of connected audio devices"