Merge commit 'c868acf442a69429056a574c67a5e0187e2b9536' into eclair-plus-aosp * commit 'c868acf442a69429056a574c67a5e0187e2b9536': show events in the UI