Merge "Fix 3210299: Extend lock screen wake timeout to 10s" into honeycomb