Merge commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6' into eclair-mr2-plus-aosp * commit 'dc2a3f60f2bed20ceb44d18ae03e75d360de4ca6': Increase light sensor delay from one to two seconds.