Merge "Add delay for mic/cam toggle dialog" into sc-dev