am aa4d5e67: am 44c3bfe2: am a405d7d1: Merge change I0a8adab9 into eclair

Merge commit 'aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca'

* commit 'aa4d5e67ca394fe89f2bc9cbccceb76dca0116ca':
  Reduce screen saver delay to 5 min.