Merge commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6' into eclair-mr2-plus-aosp * commit '9e15ab773940a3e1315cd0cce6bf8e394ce2c3f6': Fix issue #2264162 and #2252436: Now playing screens problems when locked.