Merge "Enable ActivityView in bubbles"