Merge pull request #8780 from pivanov/bug-836776

Bug 836776 - [Settings UX] [Activity Indicator] Use activity indicator to tell user of system searching for wifi network r=samjoch
Bug 845085 - Add Contact Screen Update