Merge "Fix issue #3362666 Activities launched from ongoing notifications don't animate" into honeycomb