Merge "WifiWake lock previously seen networks" into sc-dev