Merge "Remove STOPSHIP for adding activity recognition icon to permission"