Merge "Increased Wifi Wake consecutive missed scans to 5 and force add last disconnected network to Wakeup Lock."