Merge "Add metrics constant for wifi scanning dialog" into pi-dev