Merge commit '6cc42b70c592d5a112809a0230764819de3c7c12' * commit '6cc42b70c592d5a112809a0230764819de3c7c12': Fix bug 2290852: Screen wakes up in my pocket while listening to music