Merge "The wifi dialog text should be Google Sans Text" into sc-dev