Merge commit '1d697192404e3f556b8e87c9f048f16cb3256608' into eclair-mr2 * commit '1d697192404e3f556b8e87c9f048f16cb3256608': Don't trigger user activity in screenOnStoppedLw() if the screen is off.