Merge "Add positive button into regulatory info dialog" into sc-dev