Merge "Fix 2579224: Add a separate timeout for lockscreen vs display"