Merge "WakeupController should not include captive portals in suggestions" into sc-dev