Merge code from SVN.
UIActivity demo done.