Merge "Do not release the wifi lock if the screen is off." into gingerbread