Merge "ActivityView demo app"