Merge "Add limitations on hold for call-waiting." into master-nova