Merge commit '90bca75513297c2e851638f06ecc821ce75fcbe5' into eclair-mr2-plus-aosp * commit '90bca75513297c2e851638f06ecc821ce75fcbe5': Fix bug 2290852: Screen wakes up in my pocket while listening to music